<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
	xmlns:h="http://java.sun.com/jsf/html"
	xmlns:f="http://java.sun.com/jsf/core">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>Insert title here</title>
</head>
<body>
	<h:form>
		<h:dataTable
			value="#{displayAdvertisementsBean.getUserAdvertisementList()}"
			selection="#{displayAdvertisementsBean.selectedAdvertisement}"
			var="o">

			<h:column>
				<!-- column header -->
				<f:facet name="header">Id</f:facet>
				<!-- row record -->
    				#{o.advertisement_id}
    			</h:column>

			<h:column>
				<f:facet name="header">Title</f:facet>
    				#{o.title}
    			</h:column>

			<h:column>
				<f:facet name="header">Content</f:facet>
    				#{o.content}
    			</h:column>

			<h:column>
				<f:facet name="header">Category</f:facet>
    				#{o.category.name}
    			</h:column>

			<h:column>
				<f:facet name="header">Type</f:facet>
    				#{o.type.name}
    			</h:column>
<<<<<<< .mine

			<h:column>
				<f:facet name="header">Link</f:facet>
				<h:commandLink value="LINK" action="result">
					<f:setPropertyActionListener
						target="#{displayAdvertisementsBean.selectedAdvertisement}"
						value="#{o}" />
				</h:commandLink>
			</h:column>

		</h:dataTable>
=======
    			
    			<h:column>
    				<f:facet name="header">Link</f:facet>
    				<h:commandLink value="LINK" action="result">
    					<f:setPropertyActionListener target="#{displayAdvertisementsBean.selectedAdvertisementEdit}" value="#{o}" />
    				</h:commandLink>
    			</h:column>
 
    		</h:dataTable>
>>>>>>> .r25
	</h:form>
</body>
</html>